COMP = added the std namespace before endl
Merge branch 'bug-17847-rt-refactoring-dose'