Merge "[pm] link new splits to old dirs for DONT_KILL installs" into main