merge from 2.2 removing the 'domain XXX' parameters.