Fixes to branch
Merged branch