Merge pull request #342 from opjenkin/op-build-update_030_6-12-2020

op-build update 6-12-2020