Gee cat subclass 1694 rebase

rebased version of PR #1694