manual merge from cinder/camera to cinder/xaml