Ajay | #4075 | Bugfix - Handling top level group which is optional