Hotfix/gpq 164 68514 wrong count in blocks