Merge pull request #284 from opjenkin/op-build-update_030_4-28-2020

op-build update 4-28-2020