Merge pull request #3740 from op-jenkins/op-build-update_143_7-7-2020

op-build update 7-7-2020