Merge pull request #294 from opjenkin/op-build-update_030_5-5-2020

op-build update 5-5-2020