Merge remote branch 'markus/qerror' into staging