This is a kind of epic MR collecting intermediate changes towards the resolution of the issue
Closes #112 (closed)