Merge pull request #3747 from op-jenkins/op-build-update_043_7-15-2020

op-build update 7-15-2020