Merge with alex-alex/iOs-Ingress

Various updates.