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

* commit '53cb2ba4218a79b7a739aa195c3c00784e968979':
  Small tweaks to custom content management