And finally done. Please see this commit