Fixed conflicts introduced in last merge from Vladimir