Merge "Respect ambient HUN setting"