AI-581 - draft of skip logic -> simple case of skipping indicators should already work
Merge remote-tracking branch 'origin/version4' into version4