Merge "new telephony annotation class"