Significance: patch
Type: dev
Comment: Merge with trunk touched some of the files from the Product Editor package