Merge to master: Restore early return in FORM_DoPageAAction()