Merge "Fix the argument passing for the active-parameter"