bug fixes
Merge branch 'hotfix/bugs'
Merge branch 'hotfix/bugs' into develop
pod version
Merge branch 'release/0.23.4'