Merge pull request #3438 from op-jenkins/op-build-update_143_2-6-2020

op-build update 2-6-2020