Shell/4323

endlessm/eos-shell#4323