Merge "Importing the following changes from gmscore"