Merged conflicting changes
Merge branch 'cosme12-patch-176'