Merge branch 'tr/protect-low-3-fds'