Merge branch 'support-java-7-profile'