Merge "Fix InstantiationException crash" into main