Rebase on CentOS 6.6