Options
Optional flag on has_one relations
Merge branch 'feature/options'