Merged with branch multiple jndi.