Corrections of bugs to uncomplete merge conflict resolution
Merge branch 'jan'