case 2105 - Library module related entries removed.
Merge branch 'case-2105' into develop