[SWIFT] Merged upstream changes.
[SWIFT] Merged upstream changes.

eaplatanios/jelly-bean-world,eaplatanios/jelly-bean-world,eaplatanios/jelly-bean-world,eaplatanios/jelly-bean-world,eaplatanios/jelly-bean-world