Merge "Fixed invalid text selection behaviour" into devel/master