case 3108 - Recommit changes
Merge branch 'case-3108-2' into easy

* case-3108-2:
  case 3108 - Recommit changes