config.h changes
Extend possible stext length (avoid overflows)
Merge