Merge "IMS: Add support for STK CC feature"