Backport to 1.2.15