Merge branch 'COOK-4024-su-parameter'