Merge "[Settings] Use 1030 opcode, deprecate 1024."