Issue #3381073 by naveenvalecha, jrglasgow, PCate, Ruslan Piskarov, very_random_man: Add compatibility with Group 3.x
Closes #3485364