[BUGFIX] Improve 6.2 compatibility
[BUGFIX] Improve 6.2 compatibility
Merge remote-tracking branch 'origin/master'