case 2604 - Workaround for 1.1 version.
Merge branch 'case-2604' into develop