Separate extraction from a mapped and unmapped library name
Merge remote-tracking branch 'origin/master'