Fixed missing call to load dataflows from navigation
Merge remote-tracking branch 'origin/advertising' into advertising