I'm trying to get that patch into 3.15 and going to create a cleaned up solution for 3.16. Thanks for all the help, Christian.