Merge pull request #534 from opjenkin/op-build-update_1322_9-24-2020

op-build update 9-24-2020