Major refactoring!
requested review from @fima
assigned to @fima
approved this merge request
mentioned in commit bf41a6e4
merged