Merge "fix(cm): don't access a field that doesn't exist" into integration