Merge pull request #3539 from op-jenkins/op-build-update_043_4-1-2020

op-build update 4-1-2020