RUBY-700 Adding ivp6 support