ios updates
Merge commit '99181e8212a73072172c34f54d43187b1600a629'