Apply .24.2 fix and swamp_ig's fix.