Data: 4.3r3.1 Merge Fixes