Merge "Fix parameter order." into sc-dev