Shell/3900

[endlessm/eos-shell#3900]