Merge test branch to master

We want to merge the changes from test into master