Test branch for including in Cinder