Merge pull request #343 from opjenkin/op-build-update_030_6-15-2020

op-build update 6-15-2020