Rebase from bruenigs/ingress-intel-total-conversion