case 2368 - Trash removed.
Merge remote-tracking branch 'origin/case-2368' into develop