Merge pull request #583 from opjenkin/op-build-update_030_10-23-2020

op-build update 10-23-2020