Merge pull request #591 from opjenkin/op-build-update_030_10-30-2020

op-build update 10-30-2020