Merge pull request #530 from opjenkin/op-build-update_1343_9-23-2020

op-build update 9-23-2020