Merge "Fix feedback style error message." into devel/master