Merge branch 'trunk' into rewrite-junit5-hdfs