Merge branch 'jh/apply-free-patch'