manually merging some changes from my branch
migration to set absolute path on derivatives