Merge "Don't throw if hint session death link doesn't exist" into main