(cherry picked from commit 75567423fb)
# Conflicts:
# scripts/install-multi-user.sh
# scripts/install-systemd-multi-user.sh
(cherry picked from commit 75567423fb)
# Conflicts:
# scripts/install-multi-user.sh
# scripts/install-systemd-multi-user.sh