Merge branch 'master' into develop
Merge branch 'hotfix' into develop
case 3873 - Show library address regardless of library selected.
Merge branch 'hotfix'