JAL-2505 comments updated