Design #2169

#602