[547723] Improve derived library generation
4 files changed