Adding files from 1.40