Merge branch '2024-01-05-fw_env-fixes' into next