3-way
threeway option
Merge branch 'feature-threeway'