Merge pull request #3379 from op-jenkins/op-build-update_043_1-6-2020

op-build update 1-6-2020