ticket:3 enhancements according to comments
Merge branch 't3_requests'