Merge "[genlist] upstream merge r69538, r69536"