Shell/2756

endlessm/eos-shell#2756