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

Conflicts:
	bundles/framework/bundle/featuredata2/Flyout.js