Merge trunk into branch "new-naming-convention"