Merge pull request #2484 from yglb/rosy-bugsfix