Issue #111: SQLEP Consolidation