Merge "Refactor ime settings"