merge from prod trunk
removed webcam box from conv frame