Merge "InputConsumer fixes"