Before branching for jnibwapi1.0