Use "legislative_session" consistently everywhere
Merge branch 'master' into pr/129