Merge remote-tracking branch 'kali/feature/more_debug_info' into develop