Update with APNs v2.
Merge branch 'feature/APNs-v2' into develop