Merge remote-tracking branch 'origin/dev' into dev_cpp_code_conversion

1 job for dev_cpp_code_conversion in 1 minute and 38 seconds (queued for 2 seconds)