Merge "Effect: Use local cached data for Effect commit" into klp-dev