LOW : NPE protection
Merge branch '1.7.0' of ssh://github.com/openflexo-team/openflexo-technology-adapters into 1.7.0