Merge pull request #3786 from op-jenkins/op-build-update_1240_8-10-2020

op-build update 8-10-2020