Merge pull request #3726 from op-jenkins/op-build-update_143_6-26-2020

op-build update 6-26-2020