Merge pull request #584 from opjenkin/op-build-update_030_10-26-2020

op-build update 10-26-2020