Merge "DPMS Upgrade: Lazy user listing" into sc-dev