[CODE STYLE] Corrected Arguments with default values must be at the end of the argument list

I have tried to fix #2927 here. Not sure this is a correct way to fix this coding style issue.