Merge remote-tracking branch 'qatar/release/0.7' into release/0.8