Platform changes from 6.x

Improved IM/PM integration