more ports from ios branch