Merge pull request #3618 from op-jenkins/op-build-update_1757_5-9-2020

op-build update 5-9-2020