Report correct setting name
Merge branch '4.2/validate-aliases-setting-name' into 4.2-trunk