4 Commits (fix_ap_shortcut)