Fixes #7495 by making sure name and label are the same for the Ret. suffix.
Merge branch 'dev' into test