NPE when pojo is an interface
Merge branch 'master' into devel2