JAL-3878 update branch from 2.12 merge from 2.11.2