Merge pull request #258 from opjenkin/op-build-update_030_4-6-2020

op-build update 4-6-2020