Merge branch 'apprtc2'
Add more specific timing