Some notification progress
Merge remote-tracking branch 'upstream/rest-of-components'
Just merged changes from upstream