Merge branch 'amf/pom_fix' into sprint49