[PATCH 1/3] fixed issues created during last git merge