synced with prod (lost changes in docbook-makeup)