8.x-9.6
00ef6135 · Merging with 4.x branch and keeping single implementation ·