Merge "CSD: Quick fix for dose record sanitization" into main