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