Merge "Temporary fix for sms cts regression"