This is a reminder to myself so I don't forget
Following commits should have appropriate test cases added: acd3f22535d08334cea99df09df1b944e7c2d8c2 b45815e64df9f5ba90f9c625703acb043c7a6f56 f29408b582bb083359d8caf90e8f5e9dad305d29 a22600b16da4f02822003f42a5b4dcb44d3e4ec8
Fixed in several commits, mostly d8edd21ecb9899adca83afdd17b33a2a3e8f73be, aaa8e3e90dfe4e3c242487b7286ee561e1e3e811 and a090066bb41428b25c96722a4cc2550c592d9f43