release-251 Merge changes from #5329 HG-333