Merge devel to devel.release