Merge branch 't42'