merged from release-5-2-2