Merge "Fix minor transition bugs and add capabilities"