Merge "Releng PTL change to Trevor Bramwell"