-fix merge mistakes from devel