#8548: Reviewed Svens changes