There were still some issues with swath width validation (NBE7) [1074]