Merge pull request #272 from opjenkin/op-build-update_030_4-20-2020

op-build update 4-20-2020