Merge branch 'topic/jack' into topic/docbook-fix