Merge "Remove CONF values from messaging client"