merging latest fix for group notifications

commited on the latest release branch for easing tests on staging --sorry for this bad practice