Merge commit '5d5785bcfcef1d08acd5ec402e23c35367f0146e'
Enable notifications
Merge commit '0f81bdf59d4a031d7ea0be96e4173942351ec3ac'