Merge "Remove OTP_REDACTION flag that was never used and only adds confusion" into main