Issue #920 Notifications API
Issue #920 Todo removed
Merge remote-tracking branch 'upstream/master' into 919
Issue #919 Checkstyle violations fix and merge from default