accidentally left over from copy/pasting from main sections (cherry picked from commit bee39f3f) backport to 4.12.1