DEV-21334
podspec
DEV-21334 v2
Merge branch 'dev'