Some updates from MR2 source

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