JAL-3247 improvements