Merge remote-tracking branch 'origin/fix-3045' into fix-3168