Merge branch 'rs/merge-add-strategies-simplification'