Merge remote-tracking branch 'origin/pr-4344' into dev