merged master from javaconfig