Merge "Fix fatal error in I0349cfe0e322"