Merge "Add a pm unstop shell command" into main