Merge "Put back Jack and Jill Douarn 1.3-b17 as Stable"