Merge devel to 2.5.x