Merge "Adjust NSSL tests when footer flag is enabled." into main