TUP-2084 : empty folder on branch 5.3