port 1.4.1 improvements

Incorporate shell client changes from 1.4.1