Shell/3601

endlessm/eos-shell#3601