Merge "Fix compiler warning: redefinition in extendedcommands.c" into…