Merge pull request #3870 from op-jenkins/op-build-update_143_10-6-2020

op-build update 10-6-2020