LP#1661688: Add a link and other tweaks to alternate hold pickup feature