Merge pull request #3536 from ebarboni/release123api

#3443 to release123