Management libraries update
Merge pull request #1960 from christav/fri-lunch-push

Management libraries update