Migrated patch from develop branch

3e88360c9e431e90e3bbc2071307335928b069dc
fixed notifications do not add the configured response #508