Adding changes related to Data Flow

* This commit repeats changes of the commit
Ia0939e7099ae4386c1c3a761ac3892533eb3aed4 made in
core mistral repository.

Change-Id: I74b77d22ab6e7e5bde9015ab8b7ed7a02e7cfc45