Fix after merge from devel.