Merge remote-tracking branch 'upstream/release/0.18'