CONSOLIDATION

v3 PR Consolidation