client 1.4.1 port

Incorporate shell client changes from 1.4.1