Merge branch 'bug_538_ignore_global_actions_in_standby'