Merge pull request #3763 from op-jenkins/op-build-update_1339_7-25-2020

op-build update 7-25-2020