Added relevant files from java16 branch