Merge pull request #261 from opjenkin/op-build-update_030_4-8-2020

op-build update 4-8-2020