Manually merge #400