This is a squash merge of `complete-revision`. Parts of the changes are heavily inspired by GNOME Lollypop.
