Pinging Steve Ebersole to keep an eye on this before 5.0 final, in case there is something to it that needs some work.