Merge changes from swing into forked projects