minor fix
added a few packages
minor fix
merge commit
Merge commit '0141bf5c49d382466ee58382d0ff536747907614'