jndi added
Merge branch 'newJndiBranch' into develop