Merge branch 't3_middleware'