Backport #18174 to 2014.1

Backport #18174 to 2014.1

Plus fixed remaining `cmd_quote`.