devel branch for the proposed client API