Inserted changes from last commit into the java render classes