s-47665 commit restructure parameters