(WIP) JL & notifications
Merge branch 'master' into jl