Merge pull request #3371 from op-jenkins/op-build-update_817_1-2-2020

op-build update 1-2-2020