Merge devel to master

DO IT.