Merge branch '2458_command_autocompletion' into 4.7.5-stable