Merge scambra changes