Rebase onto upstream

For AMP support and STUN fixes