Bring inline with CM + my own updates for 4.4