Merge branch 'modes' into working2
Merge branch 'multi_actions' into working2
Merge branch 'user_mod_link_hints' into working2