Merge "Add RecoverySystem shell commands"