Issues/2896 notifications vc merge patch

Closes #2896 

cc @jleandroperez