merge issues so that Martin can work quietly.