Upgrade from andris9-master