Merging CM-11.0

Settings: Fix EL translations

Settings: Fix value from being overwritten with null.