am e4a44cc7: am 5b34b3ae: am c361b6fe: Merge "Small tweaks to custom content management" into jb-ub-now-jolly-elf

* commit 'e4a44cc7be0a49b7b3a0623751f7c59502697175':
  Small tweaks to custom content management