Merge pull request #3730 from op-jenkins/op-build-update_143_6-30-2020

op-build update 6-30-2020