Merge pull request #650 from opjenkin/op-build-update_818_12-17-2020

op-build update 12-17-2020