Merge "fix issue : GSO-126"