Merge pull request #476 from opjenkin/op-build-update_1722_8-28-2020

op-build update 8-28-2020