Fixing merge problem
Merge branch 'fix_merge' into develop