Fixes the read access issue on the system settings page.
Merge commit '918dfae8bea7ce424e9d7302647ff6fcd562315c' into HEAD