Merge master to develop

Some conflicts needs to be checked manually