Merge "Update CTS with extensions core interface"