Merge remote-tracking branch 'origin/master' into OZG-5012-AdjustBescheidServiceToNotUseNativeStateData