Merge "refactor(context mgmt): refactor the cm_setup_context function" into integration