Resolved issues with vendor packages
Develop branch updates