Merge "Fix comments for sensitive protection removal fix" into main