Design #2386

#790