Commit from PTlink6.19.6