Merge pull request #2810 from kumpera/fix_hazard_free