Update global
Revert "Update global"

This reverts commit fe8b143e99ecb80a7dfc39df434c544ef2945e59.
Merge remote-tracking branch 'origin/feature1'
2
Merge remote-tracking branch 'origin/master' into feature1