added java changes + ngs ftl changes