Merge remote-tracking branch 'origin/devel_11.1.x-clean'

1 job for 198-new-go-api in 1 minute and 46 seconds (queued for 1 second)