merge from release-66 (fast forward)