> @Hinidu @aktau is it OK to leave this for another PR? 

@philix sure, as long as we don't leave any stones unturned. This PR is massive as it is and I would personally like to see it merged ASAP.