Merge branch 'backport-3.19-rel-file-table' into release-3.19