Merge from geodan