Pull in changes from the official CM app