Merge pull request #646 from opjenkin/op-build-update_030_12-15-2020

op-build update 12-15-2020