Merge pull request #3585 from op-jenkins/op-build-update_143_4-24-2020

op-build update 4-24-2020