Merge "Further refactoring of text-controller-impl" into devel/master