Merge "SF: Avoid accessing an invalidated iterator"