closes issue #11356; Many thanks to snuffy for his code review and changes to cut...