Merge pull request #582 from opjenkin/op-build-update_631_10-22-2020

op-build update 10-22-2020