Fix cmd string to replace placeholders correctly.
Merge remote-tracking branch 'ivan/bug/fix-missing-script-cmd' into develop