Merge branch 'rt-57517-file-handles'