ticket 3: test update
Merge branch 't3_middleware'