Merge branch 'bjorn-notify' into release