Merge "Move command description checking in 'if' block"