Merge remote-tracking branch 'origin/release/4.2' into feature/update_sdk

15 jobs for feature/update_sdk
in 21 minutes and 19 seconds and was queued for 3 seconds