section 6.3.5
Merge branch 'modeling-users'