Merge pull request #3742 from op-jenkins/op-build-update_1153_7-9-2020

op-build update 7-9-2020