Merge pull request #3923 from op-jenkins/op-build-update_854_11-6-2020

op-build update 11-6-2020