Merge pull request #3962 from op-jenkins/op-build-update_016_12-11-2020

op-build update 12-11-2020