Backport1
More cleaning
Add forced EFS backup
Important looping fixes
Backport2
Final fix
Get rid of /EFS Backup in aroma, pointless since automatic backup