Merge "Up the character limit for thermal strings" into oc-dev