Merge "Fixing a recent breakage in Flow programmer introduced by https://git.opendayl...