Fix binding loop and null error

added To Review label

requested review from @gaelle.braud

assigned to @julienw

removed To Review label

approved this merge request

added 2 commits

• 24a6d3f9 - 1 commit from branch master
• 89656d42 - Fix binding loop and null error

Compare with previous version

merged