WIP Cartridge Refactor - Finish context checking
Merge pull request #2007 from jwhonce/wip/oo_trap_user

WIP Cartridge Refactor - Finish context checking