Merge "Fix crash issue after observation"