#193510 follow up by webernet: restore updates added through the 4.7.x lifecycle, so any 4.7.x version can be updated to 6.x