FIX date picker removed from merge