Merge remote-tracking branch 'gh-common/master'