Library update
Merge pull request #6462 from sstepashka/master

Library update