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