BIGTOP-1562. Critical tachyon puppet improvements