merge from devel branch 970b5c83ede9e14f22edaa928436277abe753eba