Fixes #6186 - Dynflowize product update.
Merge pull request #4488 from adamruzicka/fixes-6186

Fixes #6186 - Dynflowize product update