Merge pull request #3439 from op-jenkins/op-build-update_043_2-7-2020

op-build update 2-7-2020