Latest changes from iOS and Android (sorry, failed to change branch when doing the latest iOS feature)