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