Merge pull request #2539 from yglb/rosy-bugsfix