#8548: Reviewed Svens changes and added some documentation