Merge pull request #3801 from op-jenkins/op-build-update_143_8-21-2020

op-build update 8-21-2020