merge changes from SUN