[Cin] Today's GIT checkin includes 2 new features + miscellaneous