Suggestions for [#1934]

Review of #1934