Bug fixes
Merge Conflict
Merge conflict resolved