Merge pull request #285 from opjenkin/op-build-update_030_4-29-2020

op-build update 4-29-2020