LF-14029 - Merge with permalink-hub changes