Backported up to v3.15
