Devel

Merged to latest