Pull in further change from most recent stuart patch.
A few minor tweaks.