Merge pull request #4019 from vargaz/get-gclass-locking