Merge remote-tracking branch 'agl/1.0.2alpn' into agl-alpn