Task #163: fixed merge conflict 163_1