tassve: merge CM11 Changes (without breaking CM9 Compatibility)