[Cin] Some changes checked into GIT today