Merge branch 'feature/java.util.logging' into develop