Refactor multiple entry points into a single factory entry group process
Patch for merging master_2905. Covers issues: #2905, 3131, #3209, #3215, 3460