Merge pull request #3682 from op-jenkins/op-build-update_220_6-9-2020

op-build update 6-9-2020