Merge "Fix lazy measure logic to not use obsolete values"