merge
some ios fixes