Merge pull request #587 from opjenkin/op-build-update_030_10-28-2020

op-build update 10-28-2020