merge from Devel