Merge recent changes from branch 'fnp/librarian/master'

Sync between fork and origin