ticket:3 organize imports
Merge branch 't3_middleware'