Merge pull request #1352 from clebertsuconic/andy-master

https://bugzilla.redhat.com/show_bug.cgi?id=1023325 - grouping handler
Reproducer for BZ1019378