Fix crash
Merge branch 'release/candidate' of https://github.com/Solerni-R1-1/ExoBundle into develop