Trying to fix a Java xmpparse issue
Merge branch 'develop'

* develop:
  Trying to fix a Java xmpparse issue