Merge "Fix text constraint issue" into devel/master