BIGTOP-1316 enhanced shell