RAZ-2253 - Enhance Trash : completed.