19 GIBS-347 Moved units to start and end labels