Merge pull request #3550 from op-jenkins/op-build-update_143_4-6-2020

op-build update 4-6-2020