Basvi-UAT029

Crash issues at editing