Closes #1669.
Closes #1678.
Relates to https://github.com/systemd/systemd/issues/6408.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>