KLBACKLOG-2267: git cherry-pick fbe9303 -m 1
KLBACKLOG-2267: library updates