Merge pull request #3538 from ebarboni/release125api

#3443 to release125