Merge FB into master
Merge branch 'master' into feature/stabilization