Design #2273

#685