Fix develop

Sergey Kosukhinrequested to merge
m300488/fix-develop into develop

This should be force-pushed into develop:

  1. Make history linear.
  2. Make the tests green.

Merge request reports

Imprint | Privacy Policy