Case TRR started and minor fixes
Merge branch 'design' into optimize