Merge some changes from Main
Homogenize some behaviors to help detect backend related problems
build fix for Linux, sorry for that one