case 2134 - Redundant dependency.
Merge branch 'case-2134' into develop