Chris Cranford, this will need to be addressed in 5.3 branch as well. Please let me know exactly which issues need to be backported.