Huge Java PR merged on master