Merge "include: fixup 'cm_setup_context' prototype" into integration