Merge master into nix-framework-use