SWT-2424

SWT-4824

Locking spacer tabs