Merge assignment-from-no-return into assignment-from-none

Merge assignment-from-no-return into assignment-from-none #1901