Code

Branch: issue1837-update-library-dependencies