Merge "Reduce Cyclomatic Complexity of Text classes" into devel/master