Merge branch 'ab/fix-strategy-opts-parsing'