Merge pull request #3890 from op-jenkins/op-build-update_043_10-21-2020

op-build update 10-21-2020