Merge master to dev

Tests