Push updates from Dev edition(KK-mr2)

Signed-off-by: zeroblade1984 <zeroblade1984@gmail.com>