Merge branch 'SPC-for-args' into current