Merge remote-tracking branch 'phh/master' into o8.1-gsi-fix