Shell/4048

endlessm/eos-shell#4048