Design #2261

#667