Merge pull request #3367 from op-jenkins/op-build-update_158_1-1-2020

op-build update 1-1-2020