Fix imports in management commands
Provide product as attribute in mappers
Merge remote-tracking branch 'upstream/master'