Merge branch 'jk/close-duped-fd-before-unlock-for-bundle'