Merge pull request #3610 from op-jenkins/op-build-update_143_5-5-2020

op-build update 5-5-2020