fix CheckTypeSize check
Merge topic 'matches-cleanup' into next

0773ef34 fix CheckTypeSize check