Merge pull request #3781 from op-jenkins/op-build-update_043_8-6-2020

op-build update 8-6-2020