Merge pull request #608 from opjenkin/op-build-update_030_11-13-2020

op-build update 11-13-2020