This is for fixes that are backportable from master, it could be string fixes and minor features.