BS-9791
Migrate definition version
Fix the return type when switching from table to expression editor