Merge pull request #518 from opjenkin/op-build-update_030_9-21-2020

op-build update 9-21-2020