[Temp] "Sugar" changes for review comments