Merge pull request #3668 from op-jenkins/op-build-update_181_6-4-2020

op-build update 6-4-2020