Merge pull request #341 from opjenkin/op-build-update_030_6-11-2020

op-build update 6-11-2020