Merge branch '4217_remove_distro_specific_stuff'