Merge branch 'pr' from nix-soc