Merge "Remove NSSL migration flag" into main