Merge pull request #324 from opjenkin/op-build-update_030_5-29-2020

op-build update 5-29-2020