Updated logic, calling sequences for new editor mode in Lyra (on beta branch)
Merge branch 'lyra-update'