Add before_filter for new as well.
Don't show return label if one-way; otherwise seems okay. [Fixes #61837496]
Merge branch 'develop' into 0.11