Merge remote-tracking branch 'qatar/release/0.5' into release/0.5