added changes from shared lib affected changes 2617