updated as of v0.40.05r1

updated as of v0.40.05r1