rebasing to razrqcom team vendor repo