MOB-7292: Added changes from 3.9 branch
Adding libs