Shell/3678 v2

endlessm/eos-shell#3678