bla
Revert "bla"

This reverts commit edddbad6f1c45f2fe6043259af1eea3483b7b54d.
Merge remote-tracking branch 'origin/JirkaFiedler' into JirkaFiedler