[PRT] Backport improvements to the records module from 8.0