Merge with Cary Project changes