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

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