merged from release-5-3-1