CJ-1292

revisit a092df23afbca56ee0f6a6ee13f877fa029560d6