commit on v42
Merge branch 'v42' into v43