Merge "Disable DSU in recovery mode" into main