Merge pull request #3614 from op-jenkins/op-build-update_143_5-7-2020

op-build update 5-7-2020