Merge "Fix command parser"