Ajay | #4184 | Bugfix - Handle export when date within group is optional and value is not provided
Merge branch '17_0_release' into develop