[PATCH LSK-v4.1 00/12] Backport PAN to 4.1