Merge pull request #2865 from Fice/lockable_settings