Merge pull request #3663 from op-jenkins/op-build-update_12_6-3-2020

op-build update 6-3-2020