case 2535 fix. Corrections according to CR on case 2535.
Merge branch 'case-2535-fix' into develop