Merge "Detect Encryption in Progress" into main