Changes from dreamrebel
Merge