Michał Toczek

@cristianst85 should be all set now.

Seems like at this point I cannot squash all those commits, at least Rider does not lets me do this. Bcs if I'm not wrong, what you are trying to...

@cristianst85 thank you so much for this. Please take a look if everything is adjusted to your liking now :)

@FlaviusAugustus

I'll have a bit of time from 5 July onwards, so if no one's picked up on it by then, I'll see what I can do about it.