Backport change to 4.1 guide to 4.0 and 3.2