Merge pull request #647 from opjenkin/op-build-update_030_12-16-2020

op-build update 12-16-2020