Part 1
Part 2
Fix 5.3.x build