blocking [4215/trunk], it's the last backmerge from this branch]