Merge "BUG-4117: preparation for FlowCapableNode notification impl."