Merge "Fix svace issue when TJ_SUBSAMP is bigger than 7" into devel/master