Merge "TextController refactor." into devel/master