Merge "Added foldable assets to bp." into tm-qpr-dev