Revert "Merge remote-tracking branch 'origin/0.3' into i-bem__no-conflicts"

This reverts commit 39192356017decd023a6ca30e9ec55a7e26e11e1.