Merge "(TextController) Reformatted to reduce LOC" into devel/master