Incorporate feedback, see #3309