Update from release 1.6