Complete command suggestions3

Squashed #280