CUS-1907 put all one's eggs in one basket

CUS-1907 put all one's eggs in one basket
CUS-1907

CUS-1907 put all one's eggs in one basket