Is this related to the fix of PICARD-540 ?
If not, please move it to a separated commit at least.