JK-30 activation model
 -add activation model
Merge remote-tracking branch 'origin/develop' into develop