Merge branch 'master' into t3_requests
ticket:3 corrections
Merge branch 't3_requests'