Merge commit 'a9dae1a8c4cd3b5843f80e1ce3c704c49bffcd28'
Merge commit '5d5785bcfcef1d08acd5ec402e23c35367f0146e'
Enable notifications