Remerging latest from Nix