S8831 - Adding support for Manufacturer
S8831 - Adding support for Manufacturer
S8831 - Updating pom