#4774 commit