Shell/3654

endlessm/eos-shell#3654