Merge "Revert "Importing the following changes from gmscore""