3.17: encode the call-id and restore the accepted ignore-display-updates patch