Merge next fixes to devel