Going to close this one; At this point I don't expect any further 5.1 community release and there is a usable work-around.