Product d&d enhancements [deliver #84200490]