re #8610 Parsing in intervals dependand on data
re #8597 Code maintenance - comments, namespace changes