1273 Pull changes to remove SWT dependency