Initial commit for 0.40.16