Index: src/checkin.c
==================================================================
--- src/checkin.c
+++ src/checkin.c
@@ -1739,11 +1739,11 @@
       char *zMergeUuid;
       int mid = db_column_int(&q, 0);
       if( (!g.markPrivate && content_is_private(mid)) || (mid == vid) ){
         continue;
       }
-      zMergeUuid = rid_to_uuid(mid);
+      zMergeUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", mid);
       if( zMergeUuid ){
         blob_appendf(pOut, " %s", zMergeUuid);
         if( p->verifyDate ) checkin_verify_younger(mid, zMergeUuid, zDate);
         free(zMergeUuid);
       }

Index: src/db.c
==================================================================
--- src/db.c
+++ src/db.c
@@ -4218,11 +4218,11 @@
 ** the following default Content Security Policy is used:
 **
 **     default-src 'self' data:;
 **     script-src 'self' 'nonce-$nonce';
 **     style-src 'self' 'unsafe-inline';
-**     img-src * data:;
+**     img-src *;
 **
 ** The default CSP is recommended.  The main reason to change
 ** this setting would be to add CDNs from which it is safe to
 ** load additional content.
 */

Index: src/descendants.c
==================================================================
--- src/descendants.c
+++ src/descendants.c
@@ -422,11 +422,10 @@
   int multipleFlag = find_option("multiple","m",0)!=0;
   const char *zWidth = find_option("width","W",1);
   char *zLastBr = 0;
   int n, width;
   char zLineNo[10];
-  char * const zMainBranch = db_get("main-branch","trunk");
 
   if( multipleFlag ) byBranch = 1;
   if( zWidth ){
     width = atoi(zWidth);
     if( (width!=0) && (width<=39) ){
@@ -492,12 +491,11 @@
   while( db_step(&q)==SQLITE_ROW ){
     const char *zId = db_column_text(&q, 1);
     const char *zDate = db_column_text(&q, 2);
     const char *zCom = db_column_text(&q, 3);
     const char *zBr = db_column_text(&q, 7);
-    char *z = 0;
-    char * zBranchPoint = 0;
+    char *z;
 
     if( byBranch && fossil_strcmp(zBr, zLastBr)!=0 ){
       fossil_print("*** %s ***\n", zBr);
       fossil_free(zLastBr);
       zLastBr = fossil_strdup(zBr);
@@ -504,27 +502,14 @@
       if( multipleFlag ) n = 0;
     }
     n++;
     sqlite3_snprintf(sizeof(zLineNo), zLineNo, "(%d)", n);
     fossil_print("%6s ", zLineNo);
-    if(0!=fossil_strcmp(zBr,zMainBranch)){
-      int ridOfRoot;
-      z = mprintf("root:%s", zId);
-      ridOfRoot = symbolic_name_to_rid(z, "ci");
-      if(ridOfRoot>0){
-        zBranchPoint = mprintf(" (branched from: [%.*z])", hash_digits(0),
-                               rid_to_uuid(ridOfRoot));
-      }
-      fossil_free(z);
-    }
-    z = mprintf("%s [%S] %s%s", zDate, zId, zCom,
-                zBranchPoint ? zBranchPoint : "");
+    z = mprintf("%s [%S] %s", zDate, zId, zCom);
     comment_print(z, zCom, 7, width, get_comment_format());
     fossil_free(z);
-    fossil_free(zBranchPoint);
   }
-  fossil_free(zMainBranch);
   fossil_free(zLastBr);
   db_finalize(&q);
 }
 
 /*

Index: src/style.c
==================================================================
--- src/style.c
+++ src/style.c
@@ -547,11 +547,11 @@
 ** default is used instead:
 **
 **     default-src 'self' data:;
 **     script-src 'self' 'nonce-$nonce';
 **     style-src 'self' 'unsafe-inline';
-**     img-src * data:;
+**     img-src *;
 **
 ** The text '$nonce' is replaced by style_nonce() if and whereever it
 ** occurs in the input string.
 **
 ** The string returned is obtained from fossil_malloc() and
@@ -560,11 +560,11 @@
 char *style_csp(int toHeader){
   static const char zBackupCSP[] = 
    "default-src 'self' data:; "
    "script-src 'self' 'nonce-$nonce'; "
    "style-src 'self' 'unsafe-inline'; "
-   "img-src * data:";
+   "img-src *";
   const char *zFormat;
   Blob csp;
   char *zNonce;
   char *zCsp;
   int i;

Index: www/changes.wiki
==================================================================
--- www/changes.wiki
+++ www/changes.wiki
@@ -51,12 +51,10 @@
      javascript file.
   *  New TH1 commands:  
      "[/doc/trunk/www/th1.md#bireqjs|builtin_request_js]",
      "[/doc/trunk/www/th1.md#capexpr|capexpr]",
      "foreach", "lappend", and "string match"
-  *  The [/help/leaves|leaves command] now shows the branch point
-     of each leaf.
 
 <a name='v2_14'></a>
 <h2>Changes for Version 2.14 (2021-01-20)</h2>
 
   *  <b>Schema Update Notice #1:</b>

Index: www/defcsp.md
==================================================================
--- www/defcsp.md
+++ www/defcsp.md
@@ -26,11 +26,11 @@
 
 <pre>
      default-src 'self' data:;
      script-src 'self' 'nonce-$nonce';
      style-src 'self' 'unsafe-inline';
-     img-src * data:;
+     img-src *;
 </pre>
 
 The default is recommended for most installations.  However,
 the site administrators can overwrite this default DSP using the
 [default-csp setting](/help?cmd=default-csp).  For example,