Merge pull request #382 from opjenkin/op-build-update_816_7-6-2020

op-build update 7-6-2020