Fix bug that does not work on Android and iOS
Version 2.23.2
Merge branch 'release/v2.23.2' into develop