Merge "change the tag when there are several conditions in a method" into devel_3...