Merge pull request #3727 from op-jenkins/op-build-update_043_6-29-2020

op-build update 6-29-2020