ticket:6 updates
Merge branch 't6_ajax'