Merge pull request #3691 from op-jenkins/op-build-update_043_6-11-2020

op-build update 6-11-2020