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