t669 -- more improvements
Merge branch 't669' into resolved