Merge branch 'ma/config-page-only-in-list-mode'