Merge pull request #3756 from op-jenkins/op-build-update_043_7-23-2020

op-build update 7-23-2020