Fixes: #2608 group and rfc2307bis