MERGED last commits from old GIT