POPS-191 part 2 - adoption for multi flight scenario