Merge "fix issue:GSO-87"