Custom action alert notifications, new in 3.6.2

(cherry picked from commit 20e9a7dcdbca75065c619c63ec743f2d44c910b1)
Custom action spellfixes and minor adjustments after seeing published version

(cherry picked from commit 72e692750078f3e9e4f9645eaeb2999dc0a72501)