Merge changes from Dreamrebel to dev