[Issue 10161] Move nested group support to its own overlay