Return null out of the CollectingModeFactory when a non-existing strategy is looked up.
Merge remote-tracking branch 'origin/kti' into kti