updated patch to bring in the first functions with "transparent API"

this is updated variant of #1814