fixing bug #5953
Bug #6073 : now the sender of a notification can not be the receiver of it
Merge branch 'bug-5953' into core-5.14.x
fixing bug #6072
Merge branch 'bug-6072' into core-5.14.x