Merge pull request #2171 from JosJuice/nonmodal-regression Fix 4.0-5689 regression (AR codes, patches)
