Merge "Improve library lookup logic"