merge remote-tracking branch 'oxid/b-dev-ce'