Merge branch 'select-sender-identity' into next