Revert "Adding files from 1.40"

This reverts commit 539dc66df1caf3c79a01ae018a041f85ec817384.