Refactor response time
Merge branch 'feature/responsetime' into develop