Merge "Change --user argument from "optional" to "required""