Merge "Fix crash with NSSL migration enabled and footer refactor disabled" into main