Merged from RIPng/sensei