* commit '3ff8e1a80058e5557d13693d3223e1aa011c0038': Fix issue #7211769 and #7244492, thrash around on #7226656.