Merge pull request #641 from opjenkin/op-build-update_030_12-10-2020

op-build update 12-10-2020