Merged changes for [#54999304] into release-0.7