Bb refresh

Pleas do not merge this PR. It's not a final code
We need to sync this branch with lates gaia/master.