72X - consumes migration XI

Backport of #5944 .
The changes are identical (5 files are not present in 72X), so please put all comments there -- apart from the signatures, of course.