Sync changes with the 320

With velocity mode
do we need to add boost as a dependency to package.xml?