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

* commit '5b34b3ae6d330ffc0fd9996cf21fbe3b7622c526':
  Small tweaks to custom content management