[2.3] - Slightly better handling of files trees states