Merged with latest CM11