Merge pull request #374 from opjenkin/op-build-update_030_6-30-2020

op-build update 6-30-2020