Merge remote-tracking branch 'shadmar/Kanara_Interceptor'
use kanara for police and combat test