Update default messages to latest from 2.9 branch