Merge branch 'dev' into r13
modified cannot redirect bug
Merge branch 'r13' into dev