Resolve the revert of "CGR Add Framework fix