Merge "Allow --user current in dpm command"