case 3084 - Creator getter method.
Merge branch 'case-3084' into develop