Merge pull request #3537 from ebarboni/release124api

#3443 to release124