merge: n8013 sources

Signed-off-by: Humberto Borba <humberos@gmail.com>