Merge branch 'jd/t0015-modernize'