Keeping up with CM 11 Branch