synopsis: Backported to 3.4
prs: #6968 #6964
