Bug fix #9321 plus other minor fixes.