Merge branch 'release/2.1.5' into develop
Fix when image has no size
Pod version bump
Merge branch 'release/2.1.6'