Merge remote-tracking branch 'kali/bug/more-compact-debug' into develop