This stuff is going to conflict with @ichernev new changes, so I guess you should rebase on top of it.