[#63610140] post pull request fixes