Feedback for v2.4

yes, same as here