7.x-1.2
24443962 · Backport fixes from D8 version. ·