Merge branch 'release/0.40.-0.2'