Misc changes
Merged
Merge