Merge pull request #2579 from apache/pre-merge

Pre merge (3705)