Fixes to subject stats + TYNSTEP-755
TYNSTEP-694
TYNSTEP-690
TYNSTEP-743
TYNSTEP-926
TYNSTEP-1029