More work to commands (stable merge)