Simplified check in hook_form_alter
Merge branch 'feature/redirect' into develop