Merge pull request #3144 from apache/delivery

synchronize delivery and branch release125