Merge remote-tracking branch 'runrev/feature-desktop_ping_wait' into feature-externals_api_v5
Merge branch 'release-6.1.0' into feature-externals_api_v5