Fix for problem with wrong number of warning messages
Changes for DLS
Merge branch 'master' into new_simple_html_page