[AH-1966] Fixed a few feature data table issues.
Merge branch 'hotfix/1.24.2'