Merge pull request #402 from opjenkin/op-build-update_030_7-17-2020

op-build update 7-17-2020