Command form: make enter submit the correct action
Intermediate state for improvement of commands form
Command form: make enter submit the correct action
Merge branch '1.2.2'
FIX: tolerate if no piggyback dir is present