[B1368] Scotts changes from TP