BS-9614 Update and complete SWT framework