Jack and Jill Release 1.1-mr9
Merge "Fix tests written for Carnac" into ub-jack-brest