merged in dryxPM changes