Merge Branch_201340ak with csrepo

HEP