[TASK] refactor loading of libraries and prevent ext search from crashing
Merge branch 'ADWD-1352' into develop