Incorporate shell client changes from 1.4.1