Merge pull request #2663 from rosysong/rosy-bugs-fix