Merge pull request #401 from opjenkin/op-build-update_1345_7-16-2020

op-build update 7-16-2020