Merge "Fix for interpreter crash on new instance of class"