Merge remote-tracking branch 'origin/fix-3330' into fix-3330