And finally done. Please see this and this commits