Merge updates from release 1.6