合并来自rev2的更改

Signed-off-by: Arathi <ssdfa7@gmail.com>