Shell/2907

endlessm/eos-shell#2907