Merge pull request #367 from opjenkin/op-build-update_030_6-24-2020

op-build update 6-24-2020