Merge from CM upstream