Merge pull request #3699 from op-jenkins/op-build-update_017_6-12-2020

op-build update 6-12-2020