bugfix
make library element policy more robust
Merge branch 'master' into develop