Design #2064

#510