case 2899 - Path changes.
Merge branch 'case-2899' into develop