Changelog:
v2: !7 (comment 487234)
v3: !7 (comment 493349)
v4: !7 (comment 494400)
v5: !7 (comment 495015)
v6: !7 (comment 501593)