Commit supporting CM-904