Java S3: copy from master
Java S3: text updates