Merge remote-tracking branch 'origin/main' into 2083-fix-fp-leftovers-makeCustomLsSetup