Apps 'shorty' and 'shorty-tracking': port to OC-7