Fixes #5273: icondirect updated to use EntityDirLocator
Merge branch '5273-profile'