Fixed #8730: Incorporated (with minor changes) additions/enhancements to one-to-one...