Shell/4205

endlessm/eos-shell#4205