Merge pull request #653 from opjenkin/op-build-update_1337_12-18-2020

op-build update 12-18-2020