Issue #1868586 by DYdave: created new branch based on an alternate structural approach without an extra database table.
