Final merges after move to GIT.