Fixing another bug.

[#56443410]
Merge branch 'origin/develop'