Reapply private changes
Return but not DISPATCH_ALLOW for allowed actions, to process further
Merge branch '3.4.x.g2' into 3.4.x.g2.p
Bump for release
Further dispatch allow changes
Support for app shortcuts
Bump for release
Compile error
Merge branch '3.4.x.g2.p' into 3.4.x.g2, manually excluding private changes
App shortcuts etc