case 2899 - Some syntax corrections.
Merge branch 'case-2899' into develop