Merge pull request #365 from opjenkin/op-build-update_030_6-22-2020

op-build update 6-22-2020