Merge "Add module name to cps core output"