Merge pull request #5012 from op-jenkins/op-build-update_840_10-26-2022

op-build master-p10 update 10-26-2022