Shell/3678 cosimoc

endlessm/eos-shell#3678