merged raspberry branch