changes from devel branch