Cherry-picked from upstream PR #492 Resolved conflict: kept custom values (ACTUAL, progress bar modes, CUSTOM_FONT, DICTIONARY) while adding _COUNT validation
Cherry-picked from upstream PR #492 Resolved conflict: kept custom values (ACTUAL, progress bar modes, CUSTOM_FONT, DICTIONARY) while adding _COUNT validation