[Code Cleanup] 6.3 compatibility
1.0.16