Thanks. However I see the data/output/manual-references part of the latter patch was not applied, was it omitted on purpose?