Merge "Remove inline variable creation with instanceof" into main