merges from apt - upstream