Merge pull request #3612 from op-jenkins/op-build-update_143_5-6-2020

op-build update 5-6-2020