fixed some bugs for y-25
Merge remote-tracking branch 'origin/master'