Merge pull request #504 from opjenkin/op-build-update_1326_9-14-2020

op-build update 9-14-2020