Various changes
Merge