Personally, I think it would make sense to merge this into 5.6