Pom homogenisation

Change-Id: Icbd68bbdbe8cbe69d49c09e485371ea28a302414