Front port of CL leak hunter

from 06b06c9ff1b07003a96c9155fb97e5873e398c17  and
c358a1b76ce26fe1b6bfc8821e2422f509871dcf