for 4.2

Signed-off-by: Far Tseng <farrrr@gmail.com>