Merge pull request #6042 from dumganhar/develop

Fixed `ExtensionTest/CocoStudioComponentsTest` crash after applying PR #6011.